OSDN Git Service

resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Sat, 19 Oct 2013 00:56:50 +0000 (17:56 -0700)
committerElliott Hughes <enh@google.com>
Sat, 19 Oct 2013 00:56:50 +0000 (17:56 -0700)
commit37cc29e95684de126693f59e91703b2af57e7659
tree4778147e265ecd4cb6dc526c605bea40ea8b145d
parent9b41f452013123d0a394e696f597467da73108ed
parent9ff588f84b855b7d00d259a07e13d6707a95647b
resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp

Change-Id: I0250174055a16bc2d35ede1f6a0a7f033bb3c844