OSDN Git Service

Reconcile with jb-nakasig-release jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:49:09 +0000 (07:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:49:09 +0000 (07:49 -0700)
commit60573fd6083162f6a6adaa73e6978c93b76c0cb3
tree488ad058d14c0c17e8acd718e31d3c0ff22998db
parent5f4e1ac6ee30784e458df3d90c0950595ad810a6
parenta33e3b8390045910ba59ee33f3f1e31eb414a0f5
parenta5b73475e61f8565654465af9300dc279e5dfe09
Reconcile with jb-nakasig-release jb-mr0-release - do not merge

Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca