OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:51:46 +0000 (08:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:51:46 +0000 (08:51 -0700)
commit8e1a87533521ac5918855256dbb92727eda1c953
treee989c110242df97a003d67e34eb1890da23085d6
parent623a098c0d1e1c4d0eeb5136d18c6e78e06637b7
parentd1dc01c4a3e3ca91d901629c38377fb63aa622c4
Reconcile with jb-mr1-release - do not merge

Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5