| commit | 13a909410d9aeaecabee2404d19321b644a44921 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jul 01 22:33:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 22:33:43 2014 +0000 |
| tree | fee3e49a30108341b72490b972d3ad38deca703c | |
| parent | 4dc72d6ba9bce20e39b1421695bb00365a7d2705 [diff] | |
| parent | 8b7a21a8c4b96b9e971e25584bc06b6dd7865d2f [diff] |
am 8b7a21a8: (-s ours) am 50b90f3e: (-s ours) Merge "DO NOT MERGE: resync with internal master." * commit '8b7a21a8c4b96b9e971e25584bc06b6dd7865d2f': DO NOT MERGE: resync with internal master.