OSDN Git Service

Merge "resolved conflicts for merge of 6c45157c to master"
authorJose Lima <joselima@google.com>
Mon, 24 Mar 2014 22:35:08 +0000 (22:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Mar 2014 22:35:08 +0000 (22:35 +0000)
commit41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe
tree4237af1be7802ee2981b912a52143a47d94dc3e3
parent2ddf5166ea1da32f7ac63392f369f8a3c36a16df
parente9118138402b5631e7bea74b1b8b5cbfe24ca097
Merge "resolved conflicts for merge of 6c45157c to master"