| commit | 2b6bf9c26d7977da2542c15dc903cd7bb8d6878a | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Tue Jun 27 01:35:04 2017 -0700 |
| committer | Nathan Harold <nharold@google.com> | Tue Jun 27 01:35:04 2017 -0700 |
| tree | cdfffecf29c9a3c6fe9807b7dd6d45358049ece5 | |
| parent | f4a37fcdff30be88ae6f65fdd656c43dfe1f2c61 [diff] | |
| parent | bf7dcd2adb03373c2ac665030eb00a8ab3debb7b [diff] |
Merge commit 'bf7dcd2a' into oc-dr1-dev-plus-aosp Change-Id: Ic64fbf4782e129e15f0edbe2db810e81b04acd82