| commit | 7d1036a91322da1035f2861de14f539079ee1460 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Nov 13 02:12:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 02:12:06 2014 +0000 |
| tree | 76840c32d433d978dbe82e98eac36c6f44b5ee7f | |
| parent | b447112694d54de2accb6eef48586da1374b4203 [diff] | |
| parent | 400208abf83476dd9530930136f3dd85bc08dd3c [diff] |
am 400208ab: (-s ours) am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs * commit '400208abf83476dd9530930136f3dd85bc08dd3c': Add two new samples.