tree 1b838f3d6babdb368da289c285d445428b6d6926
parent 07f4a3f4d4b8398ed6aa1963f711300c4a7af5e7
parent 330c57dbd19a064d1f5a4adb3c8ed014711b473f
author Adam Lesinski <adamlesinski@google.com> 1457687928 +0000
committer android-build-merger <android-build-merger@google.com> 1457687928 +0000

Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev
am: 330c57dbd1

* commit '330c57dbd19a064d1f5a4adb3c8ed014711b473f':
  AAPT2: Add descriptions of Attributes in Styleables for R.java