tree ebb1586fb029cc05a836d56b6de95d76f3d7aade
parent e754e7880a76d23f06235e200e42704e1ace2977
parent ce32ea7345f0157a595b1dd4306a9a65f444d7c2
author Alan Viverette <alanv@google.com> 1387500035 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1387500036 +0000

Merge "Add APIs and implementation for additional caption edge types"