tree 3fa5f0150f78df8fb7b5240be37b09304abe2f84
parent facc08c7757cef56da6d10e78ce99ef7949700e3
parent caf24fc2c4bb9747eb80138bf3ce0be067851749
author Jim Miller <jaggies@google.com> 1379640808 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379640808 +0000

Merge "Add camera affordance to navigation bar on phones" into klp-dev