| commit | ed5691d4170eb8e80a90b77abab01c7f529785f5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:55:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:55:41 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | f460a4be1f2476069b4109ef179d97f50b2ffeb6 [diff] | |
| parent | 6bcf9aab6ddedfd9184aec87250ecc41ca381631 [diff] |
am 478bca2e: (-s ours) resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp * commit '478bca2e728c108158fd68b469b3a48e2a432ad9':