tree c26d1fae57e5396fa184d267974bb89fc71bd7e0
parent 482a5b6ed389ef943990277e461444626c34ebf2
parent 24715c751513ea2b24058b8d1a1e5263f5c31607
author Michael Jurka <mikejurka@google.com> 1375439854 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375439855 +0000

Merge "Small code formatting changes" into jb-ub-gel-agar