tree 2d346992dd4df41335f566276d0181a329ebc282
parent 1212762a6e8b9eafbf13ee34d169a4700a98f83b
parent a1df1a778826742eeef11ed449bcffb95e119c80
author Bill Yi <byi@google.com> 1424392246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424392246 +0000

am a1df1a77: am c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD

* commit 'a1df1a778826742eeef11ed449bcffb95e119c80':