OSDN Git Service

Merge "resolved conflicts for merge of 1d5a2592 to master"
authorAlex Klyubin <klyubin@google.com>
Tue, 14 Apr 2015 21:38:02 +0000 (21:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Apr 2015 21:38:03 +0000 (21:38 +0000)
commit2eabe5b7a9c396b1d6baebca7505a4e921312fc2
tree05da73df79d30012c9ce2d4a7d3e9bb63099115e
parent71bcd2aa5cefa767e76bc3117ed8534b67de21bc
parent338e74648ddfe480cf4bfb52cf5a9bb8732e1135
Merge "resolved conflicts for merge of 1d5a2592 to master"