| commit | 78cb7518f0f4f0d7f40f85088795d7524e400b44 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Jun 12 15:23:26 2014 +0000 |
| committer | Conley Owens <cco3@android.com> | Wed Sep 03 11:21:55 2014 -0700 |
| tree | bc4fb34abfb98b1ea6d2e5e5a91ad0aef3ebf7ed | |
| parent | 0c599a55ac00df73a055831118a7d0c54a7c9f79 [diff] | |
| parent | 098daaa33e7cea7383cd64ebf0e77606e9b65160 [diff] |
am 09504615: (-s ours) reset to master with history * commit '095046151ded466d858a6bab9b7a3798e3f65eb6':