| commit | a2737711f42383a143110f6e46db7ca59e90a700 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Thu Apr 21 10:46:07 2016 -0700 |
| committer | Jae Seo <jaeseo@google.com> | Thu Apr 21 10:46:07 2016 -0700 |
| tree | ee726837a2f33608b088bc2fe621cfc8f84d0953 | |
| parent | 57dee34ed4d1a2576817da97eb52b054aa0ea900 [diff] | |
| parent | 7a3ec49855185170f3aec09d39362b8048c697c5 [diff] |
resolve merge conflicts of 7966cf7 to nyc-dev-plus-aosp Change-Id: I44e0c5ee194d1fe60ff53ea2cc5477283b342821