| commit | 313b0d3cb45e446718eda6cea224e67b1f8059e2 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Thu Jul 27 08:42:51 2017 +0900 |
| committer | Erik Kline <ek@google.com> | Thu Jul 27 08:42:51 2017 +0900 |
| tree | c9f40f831bb11dbb51b974b5f7fa1a72e07bc396 | |
| parent | 1365bba6769d8272ceb0f485dfa547936a5b7305 [diff] | |
| parent | a260b85f114e181fccbca48ef9270cc4d95d0d56 [diff] |
resolve merge conflicts of a260b85 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: If934df91847c0eedf318d8b265cb33428bb33c49