tree ae75ddb56a1aa950221e8961c0d2718958b61987
parent 10774e144b3c99afad9a5070ccf50fdb12b5fb4e
parent a265845ecafe06c9668ce7ac67636657f4bedf86
author Glenn Kasten <gkasten@google.com> 1362436714 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1362436714 +0000

Merge "Miscellaneous cleanup" into jb-mr2-dev