am d0b810ff: Merge commit \'b1299b7414b05ee48d680d1f0199a43b31fc103d\' into HEAD
authorBill Yi <byi@google.com>
Wed, 30 Apr 2014 00:59:52 +0000 (00:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 00:59:52 +0000 (00:59 +0000)
commitbf0c789f0c0aafba0f2ed468aee20f99ca9381ba
tree0962af47cc4d9fb7036c1016d16f0fdea27312e9
parent3b0c40cfc0048db9b0bcadabae802446e7667588
parentd0b810ffdd1ffcb130e5c1f539ecba651ca3e7ef
am d0b810ff: Merge commit \'b1299b7414b05ee48d680d1f0199a43b31fc103d\' into HEAD

* commit 'd0b810ffdd1ffcb130e5c1f539ecba651ca3e7ef':