| commit | 589994504a4ffe427a02f01c7c151bad9405d2bf | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 15:55:40 2016 -0700 |
| committer | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 15:55:40 2016 -0700 |
| tree | f21d039e4ea3e32bd41fae31a9ca4cc4b430eeb5 | |
| parent | e96a44e26ccd6de17cbfabe38613c5b215d9ad56 [diff] | |
| parent | a742d1027784a54c535cff69b375a9f560893155 [diff] |
resolve merge conflicts of a742d10 to nyc-dev-plus-aosp Change-Id: Icf3257ee8a47f31ba812a5f47899b8022f4eedb7