| commit | 32f6b17daa5cd3df8d69501a37df0db8c9661f4e | [log] [tgz] |
|---|---|---|
| author | Eric Erfanian <erfanian@google.com> | Wed Sep 06 15:29:01 2017 -0700 |
| committer | Eric Erfanian <erfanian@google.com> | Wed Sep 06 22:57:58 2017 +0000 |
| tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 | |
| parent | 3882349224f0287462b9d101a2a00220ef32260f [diff] | |
| parent | aa8bf3f1ba239e233c2d72447656c019213880db [diff] |
Merge commit 'aa8bf3f1ba239e233c2d72447656c019213880db' into manual_merge_aa8bf3f1b resolve merge conflicts of aa8bf3f1b to oc-mr1-dev-plus-aosp Test: TH, make Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: If951c2bf7b440f313dfd833895cc08c6f0012a48