| commit | ebf9465d213336819b15e3b21d02afce64470d4f | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Wed Sep 02 22:48:13 2015 +0900 |
| committer | Yasuhiro Matsuda <mazda@google.com> | Wed Sep 02 22:57:53 2015 +0900 |
| tree | c561ddc0ab2431a8e525858d9e3aa214db744e9a | |
| parent | 96343073d63c72afa75057129abea4f0d4f8c103 [diff] | |
| parent | ef57e5e03b042065e69c65e910065df7306d930c [diff] |
resolved conflicts for merge of ef57e5e0 to stage-aosp-master Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c