| commit | aecbda7f2686143d7fc4d1de9ce943779471e86a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Sat Mar 14 00:26:06 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Sat Mar 14 00:26:06 2015 -0700 |
| tree | 35d778afb85fd37a3da6afa62905b39a4787263d | |
| parent | 13f2eff667db57818f44d76ac144d13651502506 [diff] | |
| parent | 22311914821f173446bfc01588b3b56da3d1b94c [diff] |
resolved conflicts for merge of 22311914 to master Change-Id: I8684191fa3efea0ed546bbad076f8760a13c5c81