tree aead29b49ed15d1fea3f61c84e6aa7a3a0d65da7
parent d4dc4cc2f2da4b9bfe4fb149636ef1f50d748d6a
parent b36f966df9e7767a6b0aeb00fea29af0c57c89be
author Dan Willemsen <dwillemsen@google.com> 1473826067 +0000
committer android-build-merger <android-build-merger@google.com> 1473826067 +0000

Convert to Android.bp am: c01121c522 am: 61bae021b5 am: f667815765
am: b36f966df9

Change-Id: I5abd251ab526d2a81b66da1509b3a51d448fd85f