| commit | 10973455bc6123e5ba19d56557eac36c96007171 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Tue Jun 21 22:15:33 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 21 22:15:34 2016 +0000 |
| tree | 9f888b6d9b1383abe69d2f5e7265469577766a8a | |
| parent | bede3bfb1e7182bdab6433a0860d8428ebe4cd15 [diff] | |
| parent | a1540899f7c5a5e7b9c117baa2a87710e9d881e6 [diff] |
Merge "resolve merge conflicts of fa2715e to nyc-mr1-dev" into nyc-mr1-dev