summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSascha Prueter <saschap@google.com>2013-11-18 23:27:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 23:27:07 -0800
commitc7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4 (patch)
tree43f06d64119869c2d9c21959f09fbf476a4f8f01 /packages
parent1e964ed808798a56664853e2aeffdc47c676ac5a (diff)
parentf7044fecee3ad1e2b2bfdd67c25b0c1536c83e18 (diff)
downloadframeworks_base-c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4.zip
frameworks_base-c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4.tar.gz
frameworks_base-c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4.tar.bz2
am f7044fec: Merge "Trying to unbreak build..." into klp-dev
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18': Trying to unbreak build...
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions