| commit | 80f0d0f2a49e3f1651af5852b2a824c5261519fc | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Jun 21 13:41:22 2016 -0700 |
| committer | Felipe Leme <felipeal@google.com> | Tue Jun 21 13:41:22 2016 -0700 |
| tree | 2ac4c2ee1a8094d512b4f60ea4b49471f88b0b11 | |
| parent | 83b1a18e482dc084abf0614338f121cb83e86e8b [diff] | |
| parent | a3d3da8de206c7f7b9a6c35c8525ea5c1e0cd62f [diff] |
resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp Change-Id: Ic75a6926e4bd2b8199e4feb7af315e84659d03a2