OSDN Git Service

Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
authorTamas Berghammer <tberghammer@google.com>
Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2017 19:59:59 +0000 (19:59 +0000)
commita553354e84f75ae256b71e6b6b3e96d85dd954f7
tree9f341e7a5577d6971aca0a9eca4dd32be71326c2
parentb4050d80427afe56fea20868f6b93a66d6c8d98b
parenta0a908f5d6cb040c74ed5dd32d715e2f686f9880
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp