| commit | b14ccf228cab22e471ad400445210e6fe807cf20 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:40:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 17:40:50 2015 +0000 |
| tree | a80d25c83adfde3b406aa34f54310fe386434af0 | |
| parent | a209e45b900b8153e05afb2f378267f827394da4 [diff] | |
| parent | b41f94219d6a9c93803ea1897b0efba15a50efac [diff] |
am b41f9421: Merge "resolved conflicts for b6c719ec to stage-aosp-master" into stage-aosp-master * commit 'b41f94219d6a9c93803ea1897b0efba15a50efac': Enable signed-integer-overflow in timedtext