Merge branch \'master\' of /usr/local/google/game/mirror/googleplex-android_googlesou...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:50:12 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:12 +0000 (19:50 +0000)
am: bfdb7e7b6a

* commit 'bfdb7e7b6a610ca1f82f8a72ef261ef2f0a0abe7':


Trivial merge