OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:11:45 +0000 (16:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Jun 2013 23:11:45 +0000 (16:11 -0700)
commit72912851ec38b96570ab60d19c175db1c73d53b5
tree5d69b611f52bd0a9b80be9fab3e394cf21528fd8
parent29a69a1144fc42d3742bacb9acee89a612cbf8b3
parentb7ea70cc55798c96fb849e35d7d688eec18faa2d
Reconcile with jb-mr2-release - do not merge

Change-Id: I3582cf75047d93865faeb93e56a8dd10c6f83f8e