| commit | 829e3841d8ea30d542b1bb8e28ef124208e79c5d | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Wed May 14 00:13:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:13:22 2014 +0000 |
| tree | 79b4f0a092044a052be21ed30cb7c6728f4200d3 | |
| parent | 0b2e9de62150b0d72d228cb8340663dd0a901bcc [diff] | |
| parent | 017a266a1ca9d28e68ffeb2f472d33175d7ab9d7 [diff] |
am 8f8fdbe2: (-s ours) Merge commit \'2604a1296\' into manualmerge * commit '8f8fdbe288702da9fa866f40fd279da5a0f36a53':