commit | 48cfeb12c5872210319ca1f4b63ef68ed09c87d5 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:08:22 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 10:08:22 2013 -0700 |
tree | 0ae3d9ebfea83148018ebf4825ad9c902e8d8e83 | |
parent | 844ebdef8c73b98ec29c75f1fd7940624e70d14d [diff] | |
parent | f28901e79bbc65193adb5e3bce641d8ce94228fe [diff] |
am f28901e7: Reconcile with jb-mr2-release - do not merge * commit 'f28901e79bbc65193adb5e3bce641d8ce94228fe':