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