| commit | 68b9b726789338c3d1bf2218ede33193ff92d38a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:49:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:44 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 041c1bee9e18d74f1c1820764a2b0ffbdf2a1a06 [diff] | |
| parent | c8c8c098337905491234b4fc566e609357f7037c [diff] |
am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp * commit 'e0b43a17852081c2fe1c0d2207006e421ffcc74b':