OSDN Git Service

am af40b4e5: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:09 +0000 (09:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:19:09 +0000 (09:19 -0700)
commit72681791764a6364216e2a4f35fbb5ec73900a24
treeee2b2298c8dec2c4f4b506d74b96267f00b25292
parent16e2bf680e19e81b430356748e853a5989d21d45
parentaf40b4e5a4778313433ce9612c51ba367acf8d66
am af40b4e5: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'af40b4e5a4778313433ce9612c51ba367acf8d66':