tree c118f07fc591e49f94186725ecc7ddb7c7bb953e
parent ed1dc9ee72410e07de24bc4a072d066981611a48
parent 36f89da544a2a960ede047051c0d7b114d6d7717
author Ben Komalo <benkomalo@google.com> 1308364926 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308364926 -0700

Merge "some brain dead typing shortening"