| commit | 98cd36527af60a5063a8eed1a1ae32540ac98738 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Aug 26 14:52:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 14:52:35 2013 -0700 |
| tree | 8b2ba0ec4ad90aac207b01cd1d34f51c3eab9a79 | |
| parent | 00ed2089e60b9a7aac0553ee9a2a621dbac9dbe3 [diff] | |
| parent | 3e272fd4081a74066515e85ae23e08cdd0685b40 [diff] |
am 3e272fd4: am f482fa84: am d7a9f708: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting." * commit '3e272fd4081a74066515e85ae23e08cdd0685b40': Hmm, contrary to Deckard's assurances, this broke internally. Reverting.