tree 922f318193f8818bb313fed2d3d88281975fde5c
parent 4e14ec7ca6a2295d456230935961cbd0e49eb7e5
parent b82357264cf74cbe813ca4d4036fd3eb0b3573d5
author Bill Yi <byi@google.com> 1424391810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424391810 +0000

am b8235726: Merge commit \'7d40b063efb4755bfe23a328ad65671165a3ab29\' into HEAD

* commit 'b82357264cf74cbe813ca4d4036fd3eb0b3573d5':