Commits
Nick Pelly authored and Android Git Automerger committed d29c9908746M
am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e' * commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e': Attempt to fix simulator build.
Showing diff to4c918335ef6