tree 55e1bdec8d6121849b1a136409f3978d03c7c088
parent 08eaa8b3dfdf18c9ab25ea6854cae0d56195259d
parent 472e06eae6ae10e99535a2bc031b33796de46a51
author Andrew Shulaev <ddrone@google.com> 1430215416 +0000
committer android-build-merger <android-build-merger@google.com> 1430215416 +0000

Merge "Show non-framework attributes in simple mode when they\'re available" into studio-1.3-dev automerge: 7925217
automerge: 472e06e

* commit '472e06eae6ae10e99535a2bc031b33796de46a51':
  Show non-framework attributes in simple mode when they're available