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