OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:19 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:19 +0000 (05:44 -0700)
commit9420c0b338106eed246b362238b063ecdab3a710
treee90dbb2620fa814c2c5b9267056164e0b10a7ec6
parentc587269c5a34d4e7412ff42e53ed6312359a8505
parentd0be146ceecd943a7db77190f7951e397412e1b5
Reconcile with jb-mr2-release - do not merge

Change-Id: I58dee084939bd1b49432bfb4e460dddeb4f6e15a