| commit | 91abec8a2c17bfe3123eaffbe697414654c37936 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Feb 21 18:37:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 18:37:06 2014 +0000 |
| tree | 01fbd259b92f678643f2d8e62a044ec8e1fdc99e | |
| parent | b26e3063301015d5dd3c275f288f77f25b6853b8 [diff] | |
| parent | 8bdab1de9b606413d8e65a1efa9dd64e1a582a70 [diff] |
am 8bdab1de: am c620d0f4: am 03914643: am a6012b6c: am 58d5e348: am 6185026e: am aeb413bc: am 94d1be18: resolved conflicts for merge of 007d20e1 to jb-mr1-dev * commit '8bdab1de9b606413d8e65a1efa9dd64e1a582a70': DO NOT MERGE fix cherrypick of Add test to check for duplicate random output