| commit | ba362ca08c550a9f15ce6947cbe64d4aa437ff49 | [log] [tgz] |
|---|---|---|
| author | Mike J. Chen <mjchen@google.com> | Wed May 16 10:21:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 16 10:21:54 2012 -0700 |
| tree | 9ecfd9783b98cf733fb837bb067b86100be742f9 | |
| parent | 830ac54641c00c500573f7c7cf5d4438584d67af [diff] | |
| parent | c6c812aba62cf44f7f83c402cdc3318108a207ed [diff] |
am c6c812ab: (-s ours) DO NOT MERGE: * commit 'c6c812aba62cf44f7f83c402cdc3318108a207ed': DO NOT MERGE: