OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:49:33 +0000 (07:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:49:33 +0000 (07:49 -0700)
commit30c0e8adbcc4a7be4d52332425344273b79335ec
tree2a83575b136a544d81f3e3bfeda4fd18e84572aa
parent123f99045ff10815b2e0ff6b07cb8cf27e78a692
parenteeaac711dc14584c62ff253af9af684144e6c95e
Reconcile with jb-mr1-release - do not merge

Change-Id: Id46d9e98b81fc5767e484afbca9660350932059d