OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:45 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:45 +0000 (08:05 -0700)
commit2dafd362c7052f1618b0d22d18043d99f4544ac0
tree83ed78ac4634f8f6ab5703ccaf368d3ab81d68fa
parent73662629957e03ef23cd1bc33640ce7d1e690e90
parente874242f22feb6aae82723f6cdf7cff228a77392
Reconcile with jb-mr2-release - do not merge

Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c