OSDN Git Service

am 83c3110c: am 1818ea8a: Add dev settings to emulator.
authorXavier Ducrohet <xav@android.com>
Wed, 7 Nov 2012 01:11:58 +0000 (17:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Nov 2012 01:11:58 +0000 (17:11 -0800)
* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
  Add dev settings to emulator.


Trivial merge