| commit | fd8de96461392acb3d4bf4ffe829735d206ba7e6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:55:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:55:46 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | ab30e3e4663969bfee9473465b9f8aa7d8e15814 [diff] | |
| parent | dbff0d6f9315587a92894936769f5be727b08dd2 [diff] |
am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp * commit '9ccf4bfbde288119e6e90f9ad58351a5d2c59ff9':