| commit | da30fd779a05a696037578e079797d95bf263a9c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Sat Jan 31 08:04:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 08:04:30 2015 +0000 |
| tree | 6993f5306c968c7924488c13d041363df234b6f3 | |
| parent | 223e62568d65158702aa75ffa32f4b9896b7f157 [diff] | |
| parent | 1575ca6e1a713f9d2e4a9f91bc6943ae10fde083 [diff] |
am 1575ca6e: am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd * commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083': Resource resolution fixes.