tree 7f282e06452239759b1c3dd347dfd5bd7cc67b0e
parent 0986121807b114ce1fff4c30304eb0ba09cb9d8f
parent 6b2f3ee3b9954b4b834d6729265acd33ef232b9c
author Scott Rowe <scottrowe@google.com> 1406059928 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406059928 +0000

am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit '6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12