| commit | 08083da011f5dfd9b7dbd45ec0d7016be9422cd5 | [log] [tgz] |
|---|---|---|
| author | Mike J. Chen <mjchen@google.com> | Thu May 17 12:40:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 17 12:40:24 2012 -0700 |
| tree | 9ecfd9783b98cf733fb837bb067b86100be742f9 | |
| parent | ba362ca08c550a9f15ce6947cbe64d4aa437ff49 [diff] | |
| parent | 97160be189cd52b5cb8eecf97fd47ed034b54f5c [diff] |
am 97160be1: (-s ours) DO NOT MERGE * commit '97160be189cd52b5cb8eecf97fd47ed034b54f5c': DO NOT MERGE