| commit | 560c9ec724bdebc31a35a934a703cd802e0926f4 | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Wed Mar 29 17:05:10 2017 -0700 |
| committer | Nathan Harold <nharold@google.com> | Wed Mar 29 17:05:10 2017 -0700 |
| tree | 0e56b2a11ee369939f5bc89f384311680b10dd87 | |
| parent | fb0ad3705dd83c172cd6915a3e2d0a5df3ef1870 [diff] | |
| parent | e45e328821badf42dc98c0b37326c73400eef651 [diff] |
Merge commit 'e45e328821ba' into oc-dev-plus-aosp Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77