| commit | 626ba0c263a5ae9983b2704a3e82c216b39387f0 | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Wed Sep 02 23:29:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 02 23:29:19 2015 +0000 |
| tree | ac00607b0847a4357bda2c3a3db1611aa9e15755 | |
| parent | be3b06766a1ed0e8cecb78c98f08dc2c2703a6d8 [diff] | |
| parent | 1be040fb7d849762bf31bf9f898a4a004015aeb1 [diff] |
am 1be040fb: am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master * commit '1be040fb7d849762bf31bf9f898a4a004015aeb1': Delete outdated options tests