| commit | ab30e3e4663969bfee9473465b9f8aa7d8e15814 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:55:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:55:44 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | ed5691d4170eb8e80a90b77abab01c7f529785f5 [diff] | |
| parent | 2808bc2faaa1fd42d64bf1b5176d4284bbcefa86 [diff] |
am 9bc8005e: (-s ours) resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp * commit '9bc8005e079a1062751b5e9d62afeef3f2407dfb':