OSDN Git Service

Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
authorLorenzo Colitti <lorenzo@google.com>
Thu, 12 Mar 2015 07:49:23 +0000 (07:49 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 12 Mar 2015 07:49:23 +0000 (07:49 +0000)
commit1c24b3f110e0521a3840c3dfce9a86343fa02672
tree543d35d405abe2696c8addb97afab28c17d6bf71
parent2f196e6c81e50b70d56c1cc06fd2aec147b58ed8
parent7b5be4c0c741e44a8592ece40902eb0071f6d138
Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"