tree 0ee80837bb89332328b831c2631ca939b6e94b16
parent 06f725eba66e227405d73ff41d930fce7921d3f6
parent 3e0c8d3d3c3c82a4fc1190f91a21409c6f9244ec
author Wink Saville <wink@google.com> 1409888999 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409888999 +0000

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

* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
  More cleanup prior to unhiding