| commit | 76cbdf5865b81c74fe725dd0466acb47cd47cf35 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Jul 17 21:10:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 21:10:26 2014 +0000 |
| tree | bc1cf95f557cff41438438e74d4bbfbfba54f571 | |
| parent | 65f8f3ed859c7b70db73795ab4ae4a9ca5fd5af5 [diff] | |
| parent | 8a5e6cf7adeadecbde1362bd761a69af79cffd7e [diff] |
am 8a5e6cf7: Merge "resolved conflicts for merge of faacd24c to master" * commit '8a5e6cf7adeadecbde1362bd761a69af79cffd7e': resolved conflicts for merge of faacd24c to master