| commit | 651da41f80d674b3f20dccfeef5d86e7c8887ae4 | [log] [tgz] |
|---|---|---|
| author | Andrew Sutherland <dr3wsuth3rland@gmail.com> | Tue Nov 13 22:43:58 2012 -0700 |
| committer | Andrew Sutherland <dr3wsuth3rland@gmail.com> | Tue Nov 13 22:43:58 2012 -0700 |
| tree | 8929338a01beeab4e9e364c984da4526496e76d1 | |
| parent | 875f6785619ef9dce7f3ba76922db8dc7f068b11 [diff] | |
| parent | 30865cb901602ed078ff2ed534529d847b3b54b5 [diff] |
Merge remote-tracking branch 'aosp/jb-mr1-release' into HEAD Conflicts: Android.mk Change-Id: Ibfc81ef9107fbf39563921a9f7334d7b79faefe6