OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:27 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:28 +0000 (16:43 -0700)
commit5adde8dbb826f0e15db4c9a64768a693245a7ee5
tree48ccc98e5bab613186b4d52aa41b5d9f2131467b
parentb7648000c387437f8e86188688f578f280540c8a
parent72ebaf115ab380fc8ecdc9343fbbf1d2cb953bcc
Reconcile with jb-mr2-release - do not merge

Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c