| commit | aa754c868cd6de4c88b3d87fbb7a60a6e004562a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 23 08:06:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 23 08:06:43 2013 -0700 |
| tree | 191f2fac7dc1ad5dc08f2807940546c555186ee2 | |
| parent | a02eae5e911f3bdc3f84f39c0ef223261b646128 [diff] | |
| parent | a842a2a61927be0c1f643e76c6ba072e6ae9f779 [diff] |
am a842a2a6: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a842a2a61927be0c1f643e76c6ba072e6ae9f779':