commit | 478dd70d54cf8b2fbc45dca4b33356a000e5b961 | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@android.com> | Mon Jan 14 18:02:17 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 14 18:02:17 2013 -0800 |
tree | 6e690e7121dba8747928f0c883b4a65bbc209e9a | |
parent | b18a780ed7c935e3ab980bf08aca7d7f0ffd9f6b [diff] | |
parent | 2e9834d2204e2624932c91f607d616a314bd72eb [diff] |
am 2e9834d2: (-s ours) am ecdafb37: am 474e07d5: am a508a341: (-s ours) am 7983cd74: am 6643c75b: (-s ours) Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev * commit '2e9834d2204e2624932c91f607d616a314bd72eb': DO NOT MERGE Update CTS Verifier version to 4.1_R4