tree aa4a6a53609f47d386dfa114be0abfc01e0e5dff
parent 3752c058e57f3b560396cc9484bd353cba75cfc3
parent 1dfb5bbe24ccbd127405dc8bb8e178536d1a70b4
author Paul Duffin <paulduffin@google.com> 1485283019 +0000
committer android-build-merger <android-build-merger@google.com> 1485283019 +0000

Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3 am: 11a97a2ff7
am: 1dfb5bbe24

Change-Id: Ib4f853674ae97e7d7b4e3cef05e2668ef514e045