| commit | e69608f8648e8d7f21c712be3bbf50b05ce8b1e3 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Fri Sep 23 14:48:01 2016 +0900 |
| committer | Hugo Benichi <hugobenichi@google.com> | Fri Sep 23 14:48:01 2016 +0900 |
| tree | 9c9ed57193af091d66f75460435f20eb05dfa1e0 | |
| parent | 4c83ebbc4d4999f4c568e736e9c38a848d475eca [diff] | |
| parent | 00f07beff9c117fa64b5704dcc24ae4864b2c996 [diff] |
resolve merge conflicts of 00f07be to nyc-mr1-dev-plus-aosp Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca