tree dc92543465aa92b71558d33de0f6f15e9c8c7573
parent b3316ef7987571661dac47614e311b8eeb45000f
parent ef961215599b1c154130d4e64e46a401d6bfef67
author Jeff Brown <jeffbrown@google.com> 1375817482 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375817483 +0000

Merge "Minor style cleanups."