OSDN Git Service

Merge "Fix hang" into klp-dev
authorMarco Nelissen <marcone@google.com>
Mon, 16 Sep 2013 22:57:17 +0000 (22:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 Sep 2013 22:57:18 +0000 (22:57 +0000)
commitbc910e5c8d05f24531bd6b11379cf41cc73415ed
tree48a82de7153143fd418c155207166e6e62eaa7c1
parenta099d1f6be3fbbb1af4c12b2ab627397f0826982
parentee08f7e36eeba80e005f9bdaebce635860a8f005
Merge "Fix hang" into klp-dev