OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:09:40 +0000 (19:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:09:40 +0000 (19:09 -0700)
commit89a4090ecae61053e3ac6c9b96a8ee469495cf01
treee68feb120bd5aa83791e3a2e91e186c4457f2aea
parent129116241022d51ca915ef1d6b94d131a3f5569f
parente20afb140c9fecbfcf5566ade46824dce642b06a
Reconcile with jb-mr1-release - do not merge

Change-Id: I56a0568d05e01d6ca908c97af3036ffe5a057df0