tree b58ef8e63bb7fa6793244fe136d90926e1040a00
parent 6643b3d878d674dd5be4b589d63dc3e6fc94df72
parent 1a7be1ec9c769203e6c8e26378de0ab8e2ad493d
author Bill Yi <byi@google.com> 1398819543 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819543 +0000

am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD

* commit '1a7be1ec9c769203e6c8e26378de0ab8e2ad493d':