| commit | 2b36e2928ba7b7ba22e0e926b6f971b864c524a1 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Sat Oct 25 19:53:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 25 19:53:04 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | 82835cc04ea8d0d4f21561c9c8744ad14ef9b33a [diff] | |
| parent | 513c112f912494bc81336149014403e65c9ab1d3 [diff] |
am 513c112f: resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp * commit '513c112f912494bc81336149014403e65c9ab1d3':