| commit | 49f911507b1ebd346b8b8338bd817f4e1416fc07 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Sep 16 22:36:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:36:33 2015 +0000 |
| tree | cc9e28f84b7b3f4b627d5da76a5356650ec936ca | |
| parent | 0a6fc7c9629bf3cdcff560acc0eb9e2371b31ca3 [diff] | |
| parent | 297566ceab1dffeedc5f11a05da87a324384b228 [diff] |
am 297566ce: am 0026da26: am fcbdc233: am 15b87ee0: (-s ours) am 7e61e28c: am 6716b0a3: am ecd778f8: (-s ours) Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev * commit '297566ceab1dffeedc5f11a05da87a324384b228':