tree 394ef6422a2ca5d157367eb3ee0fcca16ae482f7
parent a113745d1f15a358f427e9997490099e34807377
parent 839e8e56215caf59c12e7f7e81af0bb423d9af64
author JP Sugarbroad <jpsugar@google.com> 1536617373 -0700
committer android-build-merger <android-build-merger@google.com> 1536617373 -0700

[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 am: 58265f83b2 am: 422182a1ac
am: 839e8e5621  -s ours

Change-Id: Ib219842c69d669b83bcc8652e914425d5fe2fbec