| commit | 5fb629a2126665c4c24c599626233dfc61be5db9 | [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 | 70ca8dcb0b1753778ac373a16c9b0f275ee14ce9 [diff] | |
| parent | e845c04f1247c5ea5631fd2acb2d1b7774a86a14 [diff] |
resolve merge conflicts of e845c04 to nyc-dev-plus-aosp Change-Id: I423f722dcc3821b9be52613d68640b49cbac70a6