| commit | fc6bce3ea510c0a7f49c1a41f3e29d0134720ac2 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Apr 28 12:59:01 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Tue Apr 28 12:59:06 2015 -0700 |
| tree | f5417783f372151dadecd6565136677831d2017c | |
| parent | bc109d0f85157802822d0364b495dfb355fcd3d1 [diff] | |
| parent | 34e196c3c2ed894084e79cb2a237d1a1cbcd7eed [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge Change-Id: I64e3e823798bf39236a39046ee27bd28eb28b02c