OSDN Git Service

am 3c2b1975: resolved conflicts for merge of 790f9183 to klp-dev-plus-aosp
authorDirk Dougherty <ddougherty@google.com>
Tue, 5 Nov 2013 01:22:11 +0000 (17:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Nov 2013 01:22:11 +0000 (17:22 -0800)
commitf5e99f130e46cd24f1ba53b56b2a18ad7dd0aa6c
treef4fbc22ce1061e9c1e8b1efbe15bbb2eb018e599
parenteb69d6f2423d2ebefa6847267b329d5e9b616601
parent3c2b1975f52de3f838bdfb5543244bb8166d14cd
am 3c2b1975: resolved conflicts for merge of 790f9183 to klp-dev-plus-aosp

* commit '3c2b1975f52de3f838bdfb5543244bb8166d14cd':
  Doc change: Platform highlights for Android 4.4.