| commit | 52e40b6d1208f120229d4aff28de80de0842a0d9 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Nov 26 13:22:55 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 26 13:22:55 2012 -0800 |
| tree | 9be9526eddbc4d94771e034c6377e776323303d3 | |
| parent | 85c4f329001b9837f4ad9e6ef9fdf68c2d1eb6bd [diff] | |
| parent | 446c6e7ced5bb7e2f3d18c9285ba5d346194d701 [diff] |
am 446c6e7c: (-s ours) am a0d32add: DO NOT MERGE * commit '446c6e7ced5bb7e2f3d18c9285ba5d346194d701': DO NOT MERGE