| commit | 083d6f2e8f1ed8b6293e370f865d503e25edca34 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 27 16:04:21 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri May 27 16:04:21 2016 -0700 |
| tree | 5a821a55ffbe85f1c7b0932b4aba6f644876aea8 | |
| parent | 82729eb47ed206cb9a26d4e009a7affa3774ddc7 [diff] | |
| parent | 67f011fb7287603e8dd14bb401128e8941b8c95f [diff] |
resolve merge conflicts of e845c04 to nyc-dev-plus-aosp Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6