tree e1b865b973a7eb570f7e14cbdebbc8475b6eef1f
parent a9d12e8fb0445055e19c936d2cb0a4eca84c75c7
parent 05c2c22a80240310ba3f1a3caccc1d6802fd50c1
author Wei Liu <luciferleo@google.com> 1468455325 +0000
committer android-build-merger <android-build-merger@google.com> 1468455325 +0000

Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a
am: 05c2c22a80

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029