| commit | 0a7afe5aa3dfe12169d634e4aeef0612ba427b24 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 19:07:23 2015 +0900 |
| committer | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 19:07:23 2015 +0900 |
| tree | a08470154a6d05860ef5295bafedf7fedaca2801 | |
| parent | e7acda31c171f0de62142a9733008c10be32cc9f [diff] | |
| parent | 3f0813e52430bb7d13321c118a51d07369fe9107 [diff] |
resolved conflicts for merge of 70ab38a5 to master Change-Id: I7092ecb87f4020add5fe8843f188955a5579c284