OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:25 +0000 (18:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:25 +0000 (18:04 -0700)
commit03c06bc9f44626eae1af9901aaddfb4e6e911c6a
treee664bb62db87ff89580d17caacd2af3c87457cf2
parentcd9482d961d1c14b6dea7279f8524e29908b6a27
parent0c9a590efae5c17792b8f2df1657ef79b0b66a2e
Reconcile with jb-mr2-release - do not merge

Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99