refs/heads/kitkat-cts-dev - platform/frameworks/support - Git at Google

commit: 7fecc737411ff7fd0ec81f14d7f60bd0b56d3b11
[log]
author: Ed Heyl <edheyl@google.com>
Wed Oct 16 17:43:33 2013 -0700
committer: Ed Heyl <edheyl@google.com>
Wed Oct 16 17:43:33 2013 -0700
tree: ce806bbba344aee1ccd35b10239d7b88a355b463
parent: 09ad64345349f27bdeb53c536f178e46bb7ce5ac [diff]
parent: 9efa6df72677730b551d39007b498641fc37a552 [diff]

merge in klp-release (no-op)

tree: ce806bbba344aee1ccd35b10239d7b88a355b463