commit | 3ff812ce924af6fa89a8e20f634962ebc855d120 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:31 2014 +0000 |
tree | 46742980a6ff9b212c1d25c07631415a9e902103 | |
parent | c310a3a893138197fbb5f4a92594e6e47169c94e [diff] | |
parent | 3b00c418f62e2629aed7e4bb6ccbeb15d410c5f6 [diff] |
am 3b00c418: am 82537a19: Merge commit \'900ed61cbdf10ab71d1874d213c6297730dafa0e\' into HEAD * commit '3b00c418f62e2629aed7e4bb6ccbeb15d410c5f6':