tree dcb31a969ac3c790f20abbb95201866930f73d55
parent 0bebec84241833e1769132ae1f71ed2f455629a7
parent a72b941da2ef8860e3ae98c11421fa9a34cc7540
author Chris Banes <chrisbanes@google.com> 1393491718 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1393491719 +0000

Merge "Merge commit 'bf91ce9f' into klp-ub-dev" into klp-ub-dev