| commit | ece2fba0eca1ee373f54cc0220f81f155e911979 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Aug 27 20:11:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:11:03 2015 +0000 |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 | |
| parent | e23bfdecade3f3b8f6457f45cbf0c883d0717eb0 [diff] | |
| parent | 69ee2b6b43de666162c998f935197fb0d00065c7 [diff] |
am 69ee2b6b: am d5241d83: (-s ours) am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit '69ee2b6b43de666162c998f935197fb0d00065c7':