| commit | 2ff92be6268d654918a6ef8ab91dec9f3c999f6e | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Jun 23 20:45:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 20:45:07 2014 +0000 |
| tree | f2d730ff60cb742095a546856977ab8d8c18d602 | |
| parent | 6016cf6ae355fa7652759acf7e530c25052d9219 [diff] | |
| parent | 30fd7d2d82a13dba3580dd848084cba73cdd3eb9 [diff] |
am 30fd7d2d: resolved conflicts for merge of c78082b6 to master * commit '30fd7d2d82a13dba3580dd848084cba73cdd3eb9':