commit | fc322793e55adf1f83f1590fa4e5e80f84c0dc78 | [log] [tgz] |
---|---|---|
author | Andrew Shulaev <ddrone@google.com> | Tue Apr 28 10:03:36 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 28 10:03:36 2015 +0000 |
tree | 55e1bdec8d6121849b1a136409f3978d03c7c088 | |
parent | 08eaa8b3dfdf18c9ab25ea6854cae0d56195259d [diff] | |
parent | 472e06eae6ae10e99535a2bc031b33796de46a51 [diff] |
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