OSDN Git Service

Merge "resolved conflicts for merge of 78df7b5e to master"
authorJesse Hall <jessehall@google.com>
Mon, 6 May 2013 23:19:26 +0000 (23:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 May 2013 23:19:26 +0000 (23:19 +0000)
commitf986f0f590cc73879d95f30cb6ca3952d5b17f64
tree34a2f8ff9cd6673a59b1b13b70b3a59aaff52086
parentc87a732e7554e74d991cbe893c2923a349263246
parent9ee0999bcbe7fbd596462a7e1f4351ebf1c4cc97
Merge "resolved conflicts for merge of 78df7b5e to master"