summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2014-10-17 09:25:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-17 09:25:33 +0000
commitf0c1af8e4b00a973914a1a3fe22f6d0f98fb704f (patch)
tree0cd62b1ac2a43df010b9884ac3a6f9d06694dd7a /services
parent5957b6339621d1c84669581bf6a9f68f3d9fbd95 (diff)
parent22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640 (diff)
downloadframeworks_base-f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f.zip
frameworks_base-f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f.tar.gz
frameworks_base-f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f.tar.bz2
am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640': Doc change: Add Lollipop to platform versions table.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions