tree f6989b912da1a3c7ef26accf9c5ab32358357766
parent 1c4d66139d8e917e58ebe2ddc27d7db03934e518
parent 7ca17e94b01059194985d3c3fe859f164fa555aa
author Richard Coles <torne@google.com> 1449846041 -0800
committer android-build-merger <android-build-merger@google.com> 1449846041 -0800

Merge "Disable Android Beam" am: f5e0370a0d
am: 7ca17e94b0

* commit '7ca17e94b01059194985d3c3fe859f164fa555aa':
  Disable Android Beam