OSDN Git Service

am 56e6fc57: resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp
authorDirk Dougherty <ddougherty@google.com>
Tue, 5 Nov 2013 03:12:12 +0000 (19:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Nov 2013 03:12:12 +0000 (19:12 -0800)
commit35a1786dd3c465f6d1ce322fb78a98ca3a980020
tree39da3f798598b73060303fc04752c49e261b9ad7
parent1240466acb7886a4b0b9d83c2bf8cf01385681c0
parent56e6fc57387e6b8ff39c0744cf4ee4dd089ae3f1
am 56e6fc57: resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp

* commit '56e6fc57387e6b8ff39c0744cf4ee4dd089ae3f1':
  Doc change: Update landing page for kitkat.