| commit | fc64b6ad81dfb0d2ae72b429b9f23f5a5aa4841c | [log] [tgz] |
|---|---|---|
| author | Ang Li <angli@google.com> | Mon Sep 08 15:23:18 2014 -0700 |
| committer | Ang Li <angli@google.com> | Mon Sep 08 15:23:18 2014 -0700 |
| tree | 9c3b88ca69af910616f5b74ad1b19ae90ee642b5 | |
| parent | 07bbfb597277c1ec8dfb62cbe9c1dc13d3f020d7 [diff] | |
| parent | 9262a158f098a427411bc62e2d8665e56c27a5c5 [diff] |
resolved conflicts for merge of a7a34188 to master Change-Id: Ie146ce54fc1f00b575bb772eb25f76cd9c3e5149