summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-06-15 19:49:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-15 19:49:41 +0000
commite032baa9fc8a0f85474c854ff6181bd160f8289b (patch)
tree7f8b430d786cb41820347b545e4883c23ff1da93 /tools/aapt2/diff/Diff.cpp
parent74b54c517834fe4e26bb8787a6eb56930d16aff9 (diff)
parentb05ef5e4ef992998894b3b6b644f1ca405889bfc (diff)
am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev
* commit 'b05ef5e4ef992998894b3b6b644f1ca405889bfc': Only read foreground attr for FrameLayouts for targetSdkVersion < M
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions