OSDN Git Service

Merge "Resolved conflicts for merge of 28c6ec02 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:56:38 +0000 (15:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 16 Jan 2014 15:56:38 +0000 (15:56 +0000)
commitb66085750ec4e8c4a2abab241ebcbf7edbfe469c
treeec61957c8bb328444c98d3488246002a12a59860
parente974f9b3596e63d38ac14facc1398b90b6921419
parent6bb5cb24b458a11bd02e9bff37c03f6381e06b7c
Merge "Resolved conflicts for merge of 28c6ec02 to master"