summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-04-03 22:37:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-03 22:37:55 +0000
commit34c3c05963e350c477f2e34dcf9d9e05641487ff (patch)
tree276872958300d51e003348631ff3a1e150157da0 /telecomm
parent63eb83f0d649d2c3ebf1c71e43dfb3966ab19fc0 (diff)
parent232f7f0e191e07030821ff6ee360fbcc0a83756a (diff)
downloadframeworks_base-34c3c05963e350c477f2e34dcf9d9e05641487ff.zip
frameworks_base-34c3c05963e350c477f2e34dcf9d9e05641487ff.tar.gz
frameworks_base-34c3c05963e350c477f2e34dcf9d9e05641487ff.tar.bz2
am 232f7f0e: am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '232f7f0e191e07030821ff6ee360fbcc0a83756a': Add missing dependency in layoutlib build file [DO NOT MERGE]
Diffstat (limited to 'telecomm')
0 files changed, 0 insertions, 0 deletions