OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000 (17:13 -0700)
commit47f31b19811a177baa1ae868282374970295caeb
tree3610434840f2e9041aa92ce746e9b28cd917804b
parent54d97c88b57d2c341f0629c9648d4400a34e4f41
parent439b197dbef6b3643ffb7da766e261a04ffaf354
Reconcile with jb-mr2-release - do not merge

Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01