OSDN Git Service

am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master
authorCasey Dahlin <sadmac@google.com>
Wed, 2 Sep 2015 23:20:40 +0000 (23:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 23:20:40 +0000 (23:20 +0000)
commit1be040fb7d849762bf31bf9f898a4a004015aeb1
treeac47d95dc535db568416425806cf4850feea321e
parent1ef20d6221b7d752e636653df7798f6f4fb5ff06
parentb15623cf1c63d33fdd60c6046312c88cda961eb6
am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master

* commit 'b15623cf1c63d33fdd60c6046312c88cda961eb6':
  Delete outdated options tests