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:48:00 +0000 (07:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:00 +0000 (07:48 -0700)
commit86b5c67993dea522f6cc2549c93f63b0eae05379
treebdf1f0348d5a9901cfa86498bd7f88f216b6475c
parent235dc89ebadbb56719e6cec838a49c3aa07b2d1b
parentba39653eb52ff6646dd7884817c60268ae076e6f
Reconcile with jb-mr1-release - do not merge

Change-Id: I7faf49ef059f0f01586b3451426ee59d5778a25f