tree 48a2ad94241bae3f79bb7317360352cf6f11d60b
parent 9f341e4e4901b0dd538e2f69f236ddd1e302f3ba
parent bfd4422060fda9ddc39ca0f0e024cf0410bcd681
author Colin Cross <ccross@android.com> 1472708873 +0000
committer android-build-merger <android-build-merger@google.com> 1472708873 +0000

Merge "Fix missing dependency on R.java" am: 227a176508
am: bfd4422060

Change-Id: I2090c1f16e77164d82d4e4f99f478315a81f0fc3