summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2013-09-13 17:22:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-13 17:22:36 -0700
commit963b647f6570c6d2d6a5cdc1456a2a65af3f2f08 (patch)
tree32f3e2b8a8985b62b4953d19dadde49db3b43c9e /res
parent74e4f9ebe8383987bb6877a764c0cbdc0664fdf7 (diff)
parent4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2 (diff)
am 4a89348e: am a7d8c348: Merge "Fix build break." into klp-dev
* commit '4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2': Fix build break.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions