OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:18 +0000 (08:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:18 +0000 (08:20 -0700)
commitd76306343048d1e16ba92e9eb8f024ad5dfe769d
treefbb123bc21fa69026c0d4ed4f4bb426fd3e71f0a
parent81972daf3323a130ca06c9999a3a8530e33fece9
parenta01f72dea582935bf4a4e83767d3c93f233323d8
Reconcile with jb-mr2-release - do not merge

Change-Id: I35dd28838537b7d96b26cf3731e7391af23b4b86