| commit | 27ac4ac1daf9cd47bd1d308c582eca9d761278e1 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Nov 17 18:10:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 17 18:10:46 2016 +0000 |
| tree | 431c680abfaa689385de3959f2984d8764fea693 | |
| parent | 6a9981128d711ccf9e336e2f829eea44544770de [diff] | |
| parent | 1a242b67fe7f9f8972c2c08c4d26a351522ac115 [diff] |
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe Change-Id: Ifd69049e1e2d055eb99c3c40c3ca66b5500d5a1e