| commit | a6baea1cabe1d60b061da1500bce6d61aa71546e | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Mon Oct 05 17:40:43 2015 -0700 |
| committer | Bart Sears <bsears@google.com> | Mon Oct 05 17:40:43 2015 -0700 |
| tree | 3e79054111381e1fb5a59a07333f81d763f8c523 | |
| parent | 5dea1bc73c0be0d5ba9f88fc70207283d1bea781 [diff] | |
| parent | f3971f30392ec3e38ca4af37d9486f51301000ec [diff] |
Merge commit 'f3971f30392ec3e38ca4af37d9486f51301000ec' into manual_merge_f3971f30 Change had already been applied to mnc-dr-dev, so merging with -s ours