tree 0d29969c86ee7602063990e5ca2567e4c4be8182
parent f99b6f2886cde0406798f0b8b4b1666c29b387bf
parent eb80a86df01629296bab48609493882a31b091f9
author Jorim Jaggi <jjaggi@google.com> 1438116230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438116230 +0000

am eb80a86d: am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev

* commit 'eb80a86df01629296bab48609493882a31b091f9':
  Don't use screenshot if structure is disabled (1/2)