OSDN Git Service

Merge "DO NOT MERGE: The future is now." am: 802e2fd87c -s ours
authorJosh Gao <jmgao@google.com>
Fri, 21 Apr 2017 01:16:59 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 01:16:59 +0000 (01:16 +0000)
commit8efe2158406dd618e8b780fb1a078dfd4e77e490
tree30e10f2e3e6ce1c49bea429f22f275f8237034ff
parent561517e373f0586f325daedc412c499e77d9126d
parent89206224bc0cb4af406e8febb1c550029762373e
Merge "DO NOT MERGE: The future is now." am: 802e2fd87c  -s ours
am: 89206224bc  -s ours

Change-Id: I34c4eccb0d3c34f8ce830f572171e24d9e254b7c