summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android/app
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-05-23 00:34:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-23 00:34:35 +0000
commitdd5ee4b89083ec9b50b8c9739274136b0c74abb5 (patch)
tree9b1d3a1842061ee23f76cd14a5864e06e918dd36 /tools/layoutlib/bridge/src/android/app
parentaefdaa5cbd2a68aa6c8e7d229b897237562cebcb (diff)
parent4bb6b751fbbb218e8a298db4aa008472a0aa8d31 (diff)
downloadframeworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.zip
frameworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.tar.gz
frameworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.tar.bz2
Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
Diffstat (limited to 'tools/layoutlib/bridge/src/android/app')
0 files changed, 0 insertions, 0 deletions