OSDN Git Service

am 70f452ef: am 36f585b0: am f7b248b2: am 87752940: Merge "Fix issues with sizing...
authorMichael Jurka <mikejurka@google.com>
Thu, 23 Oct 2014 17:30:30 +0000 (17:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:30:30 +0000 (17:30 +0000)
* commit '70f452efbc90fcced38cb94fb9f0602ed59f6a84':


Trivial merge