| commit | 8b7a21a8c4b96b9e971e25584bc06b6dd7865d2f | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jul 01 22:28:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 22:28:31 2014 +0000 |
| tree | c1a34bc3a10329e387baa7cab7ac3a4f427ec29d | |
| parent | 1f56ae67d968f81a8b39b00dd97fcb3d4d09c02c [diff] | |
| parent | 50b90f3e8368fc072afdf592129eee44f408c757 [diff] |
am 50b90f3e: (-s ours) Merge "DO NOT MERGE: resync with internal master." * commit '50b90f3e8368fc072afdf592129eee44f408c757': DO NOT MERGE: resync with internal master.