commit | 0191be1d6795340cc20dc0388d80b4df1302a773 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Apr 02 11:04:17 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 02 11:04:17 2013 -0700 |
tree | 85f2369be584c47eb3277a117750fa4a3c5dd04a | |
parent | 5164789faf93604b3a4569366b63f8e34ee1b4a9 [diff] | |
parent | 526a09b39f2c4d80731bdb8352f00dd022fee3ad [diff] |
am 526a09b3: Reconcile with jb-mr2-release - do not merge * commit '526a09b39f2c4d80731bdb8352f00dd022fee3ad':