| commit | a1d4787294ff4fbfc875683f16b7ce5710477bd8 | [log] [tgz] |
|---|---|---|
| author | Wei Liu <luciferleo@google.com> | Thu Nov 03 13:16:57 2016 -0700 |
| committer | Wei Liu <luciferleo@google.com> | Thu Nov 03 13:17:12 2016 -0700 |
| tree | c5594bf63cb63f0e9096c05bdee925ced0e5d362 | |
| parent | 991686f99841ccffa04cd0d413440d3dcb3a3cb0 [diff] | |
| parent | ec598988c481a36b791a6a97a26b1cbb19659515 [diff] |
resolve merge conflicts of ec59898 to nyc-mr2-dev-plus-aosp Change-Id: I1de442255c20aae00adbb67199f12c8ff56c0968