OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:02:22 +0000 (14:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:02:22 +0000 (14:02 -0700)
commit20f6c310c70594e077310415b2756c9e1f42d6b5
tree4fcb9c88d56d076a7f7dc66d6ff3118607a247ba
parent6c380fe5da492c526f81c894a069e63ab62613de
parent8c5d8a6f94049b653e4fd113b093592403776fa3
Reconcile with jb-mr2-release - do not merge

Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b