tree d05b32f5dff81102b11a6e9e8fa009f3b87a87d2
parent 9dd998a18ecc9146941dfd8da744705812409e2d
parent 3e0c8d3d3c3c82a4fc1190f91a21409c6f9244ec
author Wink Saville <wink@google.com> 1409889042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409889042 +0000

am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-dev

* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
  More cleanup prior to unhiding