| commit | 97ac79462b9850a2710c97bb59aab2598863c4d9 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 16:41:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 16:41:31 2015 +0000 |
| tree | 76292b5c9fcd2bacc6482fe18d54274fe0f495f3 | |
| parent | 7988d7f825dcff633721c77313bdcf8ae316e312 [diff] | |
| parent | fc0ffd49df48032666f81988bdbea4f2778736a4 [diff] |
am fc0ffd49: am e85b1c69: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev * commit 'fc0ffd49df48032666f81988bdbea4f2778736a4': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch