OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:13:42 +0000 (08:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:13:42 +0000 (08:13 -0700)
commit6c72c1877fadca5068fa94f7a0249c0609e85534
tree777d5acd68cfa82a0f55ebbd7844f0897e545b1a
parent574ca4f4f15a42d6159150149f68bf3cb800d869
parent98be7e0f1da2d77c502dba5f135476bc6f04c29a
parent6f02c174a6ffcf9acbb272bd7ba3bb6f83dc856d
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8