OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:03:58 +0000 (18:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:03:58 +0000 (18:03 -0700)
commitd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3
tree098e78cb209cb21ff6d1b0e55bb233dfbed6ce92
parentfe365531b0ee363640fb50d5a230c0b999fbbe4d
parent42cd97bbeb0231e1dd95c25feb60dcf25bc544e9
Reconcile with jb-mr2-release - do not merge

Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e