OSDN Git Service

Reconcile with jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:08:09 +0000 (08:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:08:09 +0000 (08:08 -0700)
commit11f2612325a38dadb78d9d23146b57fa3330d00c
tree8aa21a69688d015df455c9ffef86058063395904
parent19c06156b6615ba53d81d2ecdc341c3feea21662
parentf33d47b53ced4fe642e32a7e98e22c75619a17bb
parent9905256bea7906095b26db241b636cb9f814be31
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb