tree ace7ff839779e4365793271b2c7554d0abe9ea22
parent 515907a98c3ddff2be42479364fd685103d06fe2
parent 90e99716c8e8ebf9b3cfd56387a02f843af67351
author Griff Hazen <griff@google.com> 1403381680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403381680 +0000

am 90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev

* commit '90e99716c8e8ebf9b3cfd56387a02f843af67351':
  Move sdk staging dir to a product-specific dir. DO NOT MERGE.