| commit | f095498fedf644794f48e375110f23f6d641af6f | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Thu Aug 27 20:37:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:37:05 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 71105ddb15a6c31dd1597b3dd50f2104f7e0ce74 [diff] | |
| parent | 4c9ea08f80205f95423d1ff24f13e89de2e09785 [diff] |
am 4c9ea08f: am af1b5f0d: (-s ours) am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev * commit '4c9ea08f80205f95423d1ff24f13e89de2e09785':