tree c1ff60b5c632078eeadb82df5f05b0ecc2eddacf
parent 3afdef2ef04bcef5a7af679e554b7f5988f44a61
parent 4170e2be8e7493f2ad1abd33ba74638d9d421b3b
author Ying Wang <wangying@google.com> 1392246018 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392246018 +0000

am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev

* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.